Remove tokenstream::Delimited.
#56369
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
eddyb
added
S-blocked
|
Marking as blocked on #49219. |
|
Why is it blocked on #49219? |
|
☔ The latest upstream changes (presumably #49219) made this pull request unmergeable. Please resolve the merge conflicts. |
petrochenkov
added
S-waiting-on-author
|
@nnethercote |
|
#49219 has landed; @nnethercote should be able to rebase this now. :) |
nnethercote
force-pushed
the
rm-Delimited
branch
from
00e699a
to
8e4ccef
Compare
|
@eddyb: I have rebased. |
src/libsyntax/tokenstream.rs
Outdated
| @@ -146,15 +102,15 @@ impl TokenTree { | |||
| pub fn span(&self) -> Span { | |||
| match *self { | |||
| TokenTree::Token(sp, _) => sp, | |||
| TokenTree::Delimited(sp, _) => sp.entire(), | |||
| TokenTree::Delimited(sp, _, _) => sp.entire(), | |||
There was a problem hiding this comment.
(There are many instances of this.)
|
@bors r+ |
|
📌 Commit 8e4ccef845e2870b60b08d77960b550f13ade2d3 has been approved by |
bors
added
S-waiting-on-bors
|
In case you'll want to fix #56369 (comment) |
|
✌️ @nnethercote can now approve this pull request |
Because it's an extra type layer that doesn't really help; in a couple of places it actively gets in the way, and overall removing it makes the code nicer. It does, however, move `tokenstream::TokenTree` further away from the `TokenTree` in `quote.rs`. More importantly, this change reduces the size of `TokenStream` from 48 bytes to 40 bytes on x86-64, which is enough to slightly reduce instruction counts on numerous benchmarks, the best by 1.5%. Note that `open_tt` and `close_tt` have gone from being methods on `Delimited` to associated methods of `TokenTree`.
nnethercote
force-pushed
the
rm-Delimited
branch
from
8e4ccef
to
1fe2c03
Compare
|
I addressed the nits. @bors r=petrochenkov |
|
📌 Commit 1fe2c03 has been approved by |
bors
added a commit
that referenced
this pull request
Dec 10, 2018
Remove `tokenstream::Delimited`. Because it's an extra type layer that doesn't really help; in a couple of places it actively gets in the way, and overall removing it makes the code nicer. It does, however, move `tokenstream::TokenTree` further away from the `TokenTree` in `quote.rs`. More importantly, this change reduces the size of `TokenStream` from 48 bytes to 40 bytes on x86-64, which is enough to slightly reduce instruction counts on numerous benchmarks, the best by 1.5%. Note that `open_tt` and `close_tt` have gone from being methods on `Delimited` to associated methods of `TokenTree`.
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Because it's an extra type layer that doesn't really help; in a couple
of places it actively gets in the way, and overall removing it makes the
code nicer. It does, however, move
tokenstream::TokenTreefurther awayfrom the
TokenTreeinquote.rs.More importantly, this change reduces the size of
TokenStreamfrom 48bytes to 40 bytes on x86-64, which is enough to slightly reduce
instruction counts on numerous benchmarks, the best by 1.5%.
Note that
open_ttandclose_tthave gone from being methods onDelimitedto associated methods ofTokenTree.